changes done w/ christian 01/14/13 - needs some cleanup before it will run