Merge branch 'seven-handed-clock'
Updated todos.