fixed router api call and lots of shit
final commit
locally merging in refacotring_tuesday