consolidation

Oh my god this is a cluster, I hope i can untangle this nonsense.