Move motorcontrol into glue