3 tier pt ii

Fixes #31