forms working
merge conflicts fixed