Major code overhaul with cleanup and working timer system
(JCR) Major changes including code cleanup and working timer system