Even more semi working. Off by one errors

still need to activate redo