Just pushing some of my changes