working navigation, starting cleanup