Worked on SafeMechanisms and did a little refactoring.