more testing
Almost done with #3