Merging old branch

Managed to recover the old content from DropBox so I've merged the
timer/progress system back into the main bracnh