INIT commit - server side form (part deux)

Lot's of other changes, since I haven't committed in a while.