Transitional version - overhauling everything.