WIP: getting demo going