Big push... Some cleanup, Some more 1D light