Added accessors
Working on models for testing
Fixed some things
Merged