Working on an alternate way of handling addMove, also made some progress on Tim Goddard's routine.