Added more hierarchy stuff. Beginning creation of threaded comment system.
Fixed conflicts.