collector: massive (possibly ill advised) restructuring of collector.. have to commit current work-in-progress since will die sad and lonely if lose this code.