restructure, added tests, began wings