Begin work on some more classes