Update

- Test #24 
- Refactor
- Shoot Entry support #25