Massive cleanup operation... Almost working, still a bug or two for me 
to hunt down tonight