Working force-based version complete

No real functional changes from this changes to the demo game. Though
it should make future features a bit easier.