Started to migrate fields in. UI is mostly there.