Rebased initial queue update

Tried rebasing the other PR, and it didn't quite go as planned. Putting up this PR to get feedback on possible errors.