Adding all of the things I missed before