added jamie's classes and the main file