Updated to get some tests to pass