Switch to closures ... cos closures are cool