I forgot to do a bunch of stuff in this branch