MERGE

i accidentally made a separate OSScripts repo that I have been updating by accident (instead of updating this main one...)

just merging the two together.