Implement Shephion
Merge branch 'implement-shephion'