More stuff that I should've committed like last week. Hopefully I can get back into the code soon!