Expand current-tickets functionality, refactor