Final attempt at late night refactoring
Final attempt at late night refactoring


say25/desktop,hjobrien/desktop,desktop/desktop,say25/desktop,gengjiawen/desktop,hjobrien/desktop,artivilla/desktop,say25/desktop,j-f1/forked-desktop,shiftkey/desktop,kactus-io/kactus,say25/desktop,desktop/desktop,j-f1/forked-desktop,artivilla/desktop,j-f1/forked-desktop,gengjiawen/desktop,artivilla/desktop,gengjiawen/desktop,kactus-io/kactus,artivilla/desktop,kactus-io/kactus,desktop/desktop,shiftkey/desktop,j-f1/forked-desktop,gengjiawen/desktop,kactus-io/kactus,shiftkey/desktop,hjobrien/desktop,shiftkey/desktop,hjobrien/desktop,desktop/desktop