7/17/14 - decent amount of changes to code