Made most of the methods void that needed to be void.