WIP getting rid of double popping