Did some stuff

Yep, added form elements and all that coo stuff
Form updates
ding dong
merging forms