TysWiredIn: Shuffle code around