Furious cleaning (still WIP)
expanding survey (WIP)