- merged with Eliot's
- working on Spur