Now uses nested classes
Making progress...

Started work on Javadoc
Started adding enums for bit masks to be nice