Finally finished the transmanager
fixed merges