completes mvc server side refactor