Keep up-to-date with the organization

Merging the organization repo with my own to keep up-to-date