WIP: put stuff in demo directory until conversion to functions