WIP which currently yields expected results.