Move canvas to actual library code