Merge for changes in old repo

ONE REPO TO RULE THEM ALL!