Second activity working

Refactor everything!
Find a way to pass view model
Hold on to commented code for future review