Made Grid its own thing