More work to get the moves working right