psudo stash
resolved merge conflict
moved api path to config file