Major changes - now works servlet, with tree and table