Big refactor to wrap all routes with signals