Ok after a heap of dry reading I think I'm going to have to change the way I track incoming and outgoing addresses and funding.