Finish mvp

please merge to master; master is old branch