Not done on NSTimer
8:46am commit
The 4 o'clock commit
Merge 4 o'clock
Resolved conflicts on merge
Special Move Updated