CLOSE SO CLOSE to getting swapping syrs to working