remove junk
split pjs stuff into exterior fn