Small setting changes
Changes to get prototype working including a simple demo