Backend setup

just handled a merge conflict of NOTHING please have a peek