Adding instance variables, figuring out what goes where