Adding in support for not including inactive items and generally progressing this module.