data done. more tests and cleanup left