refactor is approaching completion
lots of little updates