Edit files to adjust to new DB (Stage 1)

Stage 1 finished form1 changes. Still need to test changes to AR
process.