Added lots of stuff for mvp