Feature/timed runs

Also, bring us up to date with latest upstream develoop