Friend and foe: Demo update v1.503

I mentioned in the prior dev talk that I have been working on a lot of architectural change, I won't bore you with details, but it is mostly complete. The current demo version is quite stable (AFAIK) and is reasonably c…