Working merged version
- Apparently some things didn't get into the previous commit.
- Remove wildcard import in favor of individual classes for efficiency.