More work on new move code