Joel test

working on navigation view, pushing to master to work on