Actually added my stuff to the existing code from Spencer/Whatever this time