rebase messed up a few things so pushing again for navigation partial work
resolving merge conflicts