Features/freelance rewamp