Working on freedrawing feature, cleaned up Shape drawing

-eliminated redundancy when collecting Shape data
-freedrawing feature is a work in progress
-NOTE: please ignore the unhelpful comment in the previous commit. That
was a commit that sucessfully fixed a Git error. This should be the
comment for the previous commit.