Refactored the ShapeBuffer to be a Canvas class.