get_one now has its own query
resolved merge conflicts