merged with Phelans code (sorry phelan I put my test code in since I'm pushing it to my repo, uncomment 106 to keep testing your stuff)