* Upped to 0.7.0-SNAPSHOTS
* Major code refactoring