WIP - adding in Neat-based grid config