refactor things
working progress chart