[DEV] Implement roll control