add logging and navigation