Form 2 is done
Fixing Merge Conflicts