WIP - one test passing and still thinking through problem