Brutal refactor and field generator skeleton