Tried separating classes into their own files