Apply OOP submitting lab 05

When we move this stuff into separate files, delete this guy.