Ahh ok thanks! Looks like I might be sticking with this setup assuming the swap function comes back!