added JWT stuff
resolved merge conflict
clean up