Reorder & add commented-out 4x stuff