In middle of code refactor

Is building grid and beginning edge correctly, needs work on final edge.