Added first grid builder version + tests