More work. Got matchesstart tests to pass.