MVP implementation finished