Wages details

Rebased, and tests are passing, I'm minded to merge myself to complete fork amnesty :P