prep for branch merge, remaking pr dev