Added Shape class, yet not working.