timer.js merge and some methods now working