Merge fabian code + timer changes

Merge with fabians front-end code