Making good progress in making this project more MVC than it was before.