Rectangle draw works...sorta
Just need to make drawing work (correctly) with all shapes