Bunch of commits from local

Was originally under the branch `tests` but I kind of fixed everything and it all got jumbled up. PR'ing so we have a record of all these commits in one place if anyone wants to yell at me for anything.