Demo Version 1

Final prep for the demo version.