version two of the work page
added tests
last changes to the v2 branch
back to work phase 2
added order to the stuff