Adding some functionality to a couple classes