Chore/review mvp features