[WIP] Atomic swap

Last updated