grid works now
merge