Mostly done form

Still needs clean up and CSS love.