Added some testing code. Didn't get to work much on this but wanted to get at least a little done.