Added CV code, but need to fix canvas
Added some hacks
Fixed merge conflict