Merge Conflicts
Timer to Work

Only tested once, hope there is no bugs.
Adding struct data for timer