Some restructuring + ticket details initial develop