Initial attempt at making this package more vanilla [less custom]