Pre-Freelance Changes
Last push before freelance changes