rejiggering to support proper parallel transactions and less-hacky wait times