New Getters and Setters. Redoing code to make it neater.