broke some things into methods, cont'd tests