Issue #1
- Add domains
- Clean up feats more