All the bones are in now, need to wire up some more stuff but getting closer

Skipping the TDD for now just to get this out the door... =/