Basic updates
Some Obectify cleanup
Merge pull request #79 from ArcBees/brandon_update

Brandon update