First commit of 2021 done. Not sure what I'm gonna call it, but the architecture is solidifying a bit.