Slight refactor

Slight refactor to step factored. Removed undo method until I can figure
out a better way implement a memento