Finish first real version
Wrap up the canvas stuff