Finally completely merged my changes back in