Initial changes to move towards a tree based time system