Continuation - this is a much larger overhaul than I expected
Things are sort of working