Refactor to easilly allow add units
Add heavyDummy