Finished first MVP implementation