move methods around as prelude to moving to separate object