Thursday Afternoon Commit!!

Messed some stuff up, fixed all the forms. yay!