Changed the draw method to take a Shape object instead of separate parameters.