Rearrange the field namespce
Correct some shit
Stash these here for now
Lots of work