Form now (mostly) works