Continued integration of new classes

Still not ready for production release