Working version. Woot.