progress
finished new navigation functionality