Demo merge

This should merge everything except the last auth stuff, as per Ed and Phil and my discussion post demo. Let me know if I constructed it wrong, somehow