Finished it up. Got all tests to pass!