back on the right track, nav work coming

Hopefully no issues!