Mostly working, fields now correctly ordered