Remove/add fields and moving things around