Changed Objects code, along with the extending classes so we're not arbitrarily replacing code.