Field mapping and initial clustering (working but missing serializatino).
TODOs for tomorrow.