WIP gearD - Refactor from reviews

* Skip containers with name ending in '-data'