rough reorganisation

going home now, will refine this tonight