More classes and code added

Still not ready for production