added some methods and all that good stuff