Updated everything to yours and added MVC

I know you don't read this so why :P