Common Room - 30/10/2014

Mostly timer stuff
Revert "Common Room - 30/10/2014"

This reverts commit 0d456a9611fe1607ec7e88bfb45ab2e6854cde21.