Did some changes with the object creator in CreateShape after todays presentation. Now the app creates all figures from the Shape class.