pushing in the right direction, but much work to be done. saving work...