back to good ole MVC. Daniel's a trooper
Merge branch 'test' of https://github.com/thomas4g/2340 into test