Brought in a lot more demo functionality.