Upped the whole code to reflect my changes