Updated to an initial stab at overrides