More work done, new classes have their own file now