Two shapes working with on-screen instructions

still needs a code cleanup
Merge pull request #2 from Cheddles/two-shapes

Two shapes working with on-screen instructions