Refactoring to MVC... lots of concurrency now...