Inital passing test. Will seperate files into smaller classes