Rev1

**NOT READY FOR MERGE**

- Fixes #10 

This is not backwards compatible yet so please do not merge.