Small changes

Mostly been thinking about structure.
Will probably not follow MVC as originally planned