Updates

Moved some classes made fixes to other classes.

Will be working on a viewer in the next couple of days.