Removed Barista dependency in favour of our own Router