Commit 1.16

Changed the token behaviour to occupy a holder. Better functionality
this way. Also started work on the invasion screen.