Hack a little bit for performance.  Will have to come back tot his.