Modifications & new Helpers

This is still a work-in-progress