As far as I can tell the logic is all there..