unit test running on mock data service and new ones written
navbar in, stash before refactor
refactor was outrageously easy and now commented