more stuff
:smoking: fixed merge conflicts
:smoking: inquiry route