Lots of functions in the repository right now, move everything over to classes and tidy it up.
Activity