Adding in some of my additions