Added drawing of multiple different shapes!