time increments and everything working. time for a refactor now..