WIP: list of issues working, hacked to use DI