Big commit full of random changes... make these smaller