Ported the tick handler
Merge branch 'ThisLooksFun'