Order the files.
Start working on OG field as a plugin.