working through some jira tickets