very close.. testing in progress