hapi 8. Closes #22