working on navigation setup - sparrow
fixed conflicts. navigation almost working!