mostly stable build - about to refactor time processing