Almost finished with the MVC move.