grid rework complete
merged
fixed the specs