Turning sources into objects throughout (WIP).