got all tests passing and everything looks golden