Adds Changes from Skalawag