final version with nav controller - rip out everything and implement CD from scratch