Commited the main class code and cleaned up unneccessay comments