WIP: testing out speed improvements when showing the container tree on the client
code cleanup to last commit