Made some progress
Merge branch 'master' of github.com:mackorone/mousee