WIP JIRA refactor