Phalanx redoux

Final merge