Actually added all the things I said I added in the last commit