finished up pre/testing