Change field order.
Tweak markup.
Implement get_initial method.