Update, includes super hacky transit injection/fitting out of transit