Bunch of changes, got highlighted available moves working.
Merge branch 'master' of https://github.com/carrieb/MainActivity.git