Changes prior to separating into an MVC framework