added timer. about to covert all to angular.