Made tests pass on the new syntax
Cleaned up some of the accessors. Refactored the Resources