Lots of todos from demo today!