Extract stats functions in a seperate module
Refactor function names in stats
Fix problem with inclusion of current job estimate