Once this issue is cleared up I think this is ready to merge.