(#579) - Merge rev_map into rev_tree

Not completed yet, just wanted to run CI tests