@tekin's Twitter archive

Commit 1 shuffles some code around to more easily accommodate a change to behaviour , but _without actually changing any behaviour_. Commit 2 then changes the behaviour.