pulling out forms into a separate file, a little cleanup
making threesomes work