Attempt number 2 at committing this time

Memento is done and working on the other classes.