Fixes and Implementation
Implemented new ResourceBased objects.
Moved some methods to their more appropriate places.
Removed redundancy