Major refactor of contact management... buggy.