Restarted S2013 branch, setting up for opening of term, and refactoring to work in 10 3 hours meetings rather than 20 2 hour meetings.