Some work on fixing problems with TMI being given.

More needs to be done to implement this. (Working on #45)