Coding OCD made me reorganize some of this mess
Merge remote-tracking branch 'origin/master'