More navigation code, added whereami code