refactored forms from users
merge
merged?