Started porting code to "clean" canvas demo
Still porting code to "clean" canvas demo