This code is really bad, need to re-write it all. - should probably use @properties to ensure future changes will not break the API
