#31 - Updates in route to Issue 31 completion