closer to testing

organized code.