finished testing/fixing mvp