First pass at motion controls