start extracting a class - OO will improve in time :)