Restructuring of the whole thing, hopefully moving in the correct direction...