Demo prep

resolves #2 and #1