June 3, 2014

- rewrote some code, added some new classes