Fixed treeSerialization, refactored subtrees and created enum. Factored
out common watch implementation into ASimulator.