mostly finishes router refactor, having a weird bug with the bucket list controller