Might have some bugs: am presently working, but I just wanted to merging a few changes I've made before I get out of sync again and have to go through this process once more haha