more fluffing about in TODO