#39 - Incorporating Alex's navigator from #143