Working on new documentation generator