nicer code to admin tracker,WIP
stable test suite, wip for working offline