Working version along side shifty seeming client code