PARTIAL step 18, needs fall off canvas fix.