#31, #32 progress with canvas