Demo nearly done, just a few bugs left to squash...