Drop conneg closes #71, routing refactor closes #64