Re-write of my timer
Usable but a bit buggy. Currently not supporting the timer, but PRs are welcome.