cleaned up, still working on PA nav