WIP: Fix condition finding, still need to update caller.