-added DrawHandler and MovementHandler