whoops a bunch of things I forgot to commmit to