Overhaul objects and move to a working state
Merge pull request #14 from ericandrewlewis/working-example

Overhaul objects and move to a working state