Expanding main package with helper classes, pending implementation