Added various stuff, started tests
Merge branch 'master' of https://github.com/ogarci5/proposal_mobile