Working form swapping, lead tracking & validation

Build 0217