Working on Part B

some minor things to fix like the size of the shape but otherwise
working quite well.