i still need to audit this, it's on my list.  the if here is clearly broken, tho