Commit 1.18

Bad name for previous commit. Still working on invasion UI.