@User has indicated that a refactor of the codebase is in the works, so that may take care of it