WIP convert to new yahttp api and router