cleaned up more tons and got everything into mvc