work in progress changing router to location-bar