got all tests passing with current feature set