OK, more demo stuff working now.