prepping to merge logic into development