Continues to flesh out, fix interclass dependencies. Begins implementing some new classes.