Added code for TM. Not tested.
Fucking things up a bit
Fucking things up a bit
Fixed some stuff.
Fixed some stuff.
Merge completed.