Wip/ultimate collectors

collectors, finally final...