Strung together on June 22

Added the two branches together, this is now "officially" up to date