Work on switching to canvas