Forms update

All of the sexy forms (when they work)