#351 Implement field overhaul