Halfway through overhauling twitter source.