got merge happy somewhere and deleted this code, adding back to branch