Big refactor of Pull Request. Moved into object class. small bug fixes. ...

...separate timers