Mostly ready for PT 3/20, still need small adjustments