Work on new result handling (WIP)