Moved nav added some code to test

I'll work out major changes later.