Started breaking object definitions into separate headers