Tons of rework & rename