Added Motion category, created WaypointMotion