Triangle and Shapes added, Tests and Updated GUI.