re-org and clean up, add 'how well are we doing' tool