get working again after rewrite, tests passing