Needs code cleanup
assets for demos