5/7/14 - major code addition and changes