Mvc

Still bad but it's better