Controller Updates

 - Adding hash map of shapes
 - Reading in user values