Storing all shapes in draw. Fix method usage of kinetic.