diff --git a/README.md b/README.md
index 130f27e..257c293 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ From the command line run `apm install docblock-python`. You can also install it
 
 ## Available styles
 
-* Numpy style: [A Guide to NumPy/SciPy Documentation](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt).
+* Numpy style: [A Guide to NumPy/SciPy Documentation](https://numpydoc.readthedocs.io/en/latest/format.html#docstring-standard).
 * Google style: [Google Python Style Guide](http://google.github.io/styleguide/pyguide.html).
 * Sphinx style: [Sphinx documentation](http://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html#info-field-lists).
 * Epytext style: [Epytext documentation](http://epydoc.sourceforge.net/epytext.html).
diff --git a/lib/base.js b/lib/base.js
new file mode 100644
index 0000000..318526d
--- /dev/null
+++ b/lib/base.js
@@ -0,0 +1,16 @@
+'use babel';
+/* eslint-disable require-jsdoc*/
+
+import packageConfig from './config.json';
+
+export default {
+  config: packageConfig,
+  options: {},
+  subscriptions: null,
+  accepted_starts: ['def', 'class', 'async def'],
+  stop_words: ['def', 'cdef'],
+  ordered_sections: [
+    'Parameters', 'Returns', 'Other Parameters', 'Raises',
+    'See Also', 'Notes', 'References', 'Examples',
+  ],
+};
diff --git a/lib/docblock-python.js b/lib/docblock-python.js
index c8f3231..bb7e65a 100644
--- a/lib/docblock-python.js
+++ b/lib/docblock-python.js
@@ -3,11 +3,17 @@
 
 import {CompositeDisposable} from 'atom';
 import packageConfig from './config.json';
-import templates from './templates.js';
-import {formatLint, lint_def, get_class_init, get_missing_attr,
-  lint_docblocks, getStyledParam} from './linter-docblock-python.js';
-import {loadProjectConfig,
-  writeProjectConfig} from './projectconfig-docblock-python.js';
+import {
+  generate_docblock,
+  get_all_docblocks,
+} from './utils';
+import {
+  provideLinter,
+} from './linter-docblock-python.js';
+import {
+  loadProjectConfig,
+  writeProjectConfig,
+} from './projectconfig-docblock-python.js';
 
 const main = {
   config: packageConfig,
@@ -21,963 +27,28 @@ const main = {
   ],
 };
 
-function get_header(start, lines, accum='') {
-  let editor;
-  let query;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    query = accum + '\n' + editor.lineTextForBufferRow(start.row + lines);
-    query = query.trim();
-    // editor.setCursorBufferPosition(start);
-    // editor.moveDown(lines);
-    // editor.moveToEndOfLine();
-    // editor.selectToBufferPosition(start);
-    // query = editor.getSelectedText().trim();
-    if (!(/:$/.test(query))) {
-      // Handle one-line functions that return something
-      if (query.includes('return') || query.endsWith('...')) {
-        this.options.tabs = this.options.tabs.slice(that.options.tab_length);
-        return [query, lines];
-      };
-      if ((start.row + lines) <= (editor.getLineCount() - 2)) {
-        let tmp = get_header(start, lines + 1, query);
-        if (!tmp) return null;
-        query = tmp[0];
-        lines = tmp[1];
-      } else {
-        return null;
-      };
-    };
-  };
-  return [query, lines];
-}
-
-function numpy({name, tabs, default_desc_text, use_defaults, default_value,
-  use_types, arg_type, type}) {
-  return [
-    `${tabs}${name} :`,
-    (use_types) ? ` ${arg_type}` : '',
-    '\n',
-    `${tabs}    `,
-    (default_desc_text) ? `Description of ${type} \`${name}\`` : '',
-    (use_defaults && default_value) ? ` (the default is ${default_value})`:'',
-    '.',
-  ].join('');
-}
-
-function google({name, tabs, default_desc_text, use_defaults, default_value,
-  use_types, arg_type,
-  type}) {
-  return [
-    `${tabs}    ${name}`,
-    (use_types) ? ` (${arg_type}): ` : ': ',
-    (default_desc_text) ? `Description of parameter \`${name}\`` : '',
-    (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
-    '.',
-  ].join('');
-}
-
-function sphinx({name, tabs, default_desc_text, use_defaults, default_value,
-  use_types, separate_types, arg_type, type}) {
-  if (separate_types && use_types) {
-    return [
-      `${tabs}`,
-      (type == 'parameter') ? ':param' : ':attr',
-      ` ${name}: `,
-      (default_desc_text) ? `Description of parameter \`${name}\`` : '',
-      (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
-      '.\n',
-      `${tabs}:type ${name}: ${arg_type}`,
-    ].join('');
-  } else {
-    return [
-      `${tabs}`,
-      (type == 'parameter') ? ':param' : ':attr',
-      (use_types) ? ` ${arg_type} ` : ' ',
-      `${name}:`,
-      (default_desc_text) ? ` Description of parameter \`${name}\`` : ' ',
-      (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
-      '.',
-    ].join('');
-  };
-}
-
-function epytext({name, tabs, default_desc_text, use_defaults, default_value,
-  use_types, arg_type, type}) {
-  return [
-    `${tabs}@param    ${name}: `,
-    (default_desc_text) ? `Description of parameter \`${name}\`` : '',
-    (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
-    '.\n',
-    `${tabs}@type:    ${arg_type}\n`,
-  ].join('');
-}
-
-
-function format_lines(params, options, type) {
-  let lines = null;
-  lines = params.parameters
-    .map((v, i) => {
-      if (v === 'self') return undefined;
-      let name = v;
-      let default_value = params.defaults[i];
-      let arg_type = params.types[i];
-      if (arg_type === null) {
-        arg_type = 'type';
-      };
-      let tabs = options.tabs;
-      let default_desc_text = options.default_desc_text;
-      let use_defaults = options.use_defaults;
-      let use_types = options.use_types;
-      let separate_types = options.separate_types;
-      if (options.style == 'numpy') {
-        return numpy({name, tabs, default_desc_text, use_defaults,
-          default_value, use_types, arg_type, type});
-      }
-
-      if (options.style == 'google') {
-        return google({name, tabs, default_desc_text, use_defaults,
-          default_value, use_types, arg_type, type});
-      };
-
-      if (options.style == 'sphinx') {
-        return sphinx({name, tabs, default_desc_text, use_defaults,
-          default_value, use_types, separate_types, arg_type, type});
-      };
-
-      if (options.style == 'epytext') {
-        return epytext({name, tabs, default_desc_text, use_defaults,
-          default_value, use_types, arg_type, type});
-      };
-    })
-    .filter(Boolean);
-  return lines;
-}
-
-function activate(state) {
-  // Events subscribed to in atom's system can be easily cleaned up with a
-  // CompositeDisposable
-  this.subscriptions = new CompositeDisposable();
-
-  // Register command that toggles this view
-  this.subscriptions.add(atom.commands.add('atom-workspace', {
-    'docblock-python:generate_docblock': () => this.generate_docblock(),
-    'docblock-python:writeProjectConfig': () => writeProjectConfig(),
-  //   'docblock-python:add_section_notes': () => this.add_section_notes(),
-  }));
-
-  loadProjectConfig();
-}
-
-function provideLinter() {
-  that = this;
-  return {
-    name: 'docblock-python',
-    scope: 'file', // or 'project'
-    lintsOnChange: true, // or true
-    grammarScopes: ['source.python'],
-    lint(textEditor) {
-      const editorPath = textEditor.getPath();
-      return new Promise(function(resolve) {
-        resolve((that.lint_docblocks() || [])
-          .map((missing) => {
-            return that.formatLint(missing.pos,
-              missing.par, missing.type, editorPath);
-          })
-        );
-      });
-    },
-  };
-}
-
-function deactivate() {
-  this.subscriptions.dispose();
-}
-
-function serialize() {
-  return {};
-}
-
-function extract_parameters(query) {
-  let args = /\((.|\r|\n)*\)/.exec(query);
-  if (args === null) {
-    return {parameters: []};
-  };
-  args = args[0];
-  args = args.slice(1, args.length - 1);
-  let defaults = [];
-  let args_list = scanArgs(args)
-    .filter((x) => {
-      return x.trim() !== 'self' &&
-      x.trim() !== '*' &&
-      x.trim().length > 0;
-    })
-    .map((x) => {
-      let resp = x.split('=')[0].trim();
-      let default_ = x.split('=')[1];
-      default_ = default_ ? default_.trim() : null;
-      defaults.push(default_);
-      return resp;
-    });
-  let params = [];
-  let types = [];
-  args_list.map((x) => {
-    let parts;
-    if (x.indexOf(':') > 0) { // Normal typing
-      parts = x.split(':');
-      params.push(parts[0].trim());
-      types.push(parts[1].trim());
-    } else if (x.indexOf(' ') > 0) { // Cython typing
-      parts = x.split(' ');
-      params.push(parts[1].trim());
-      types.push(parts[0].trim());
-    } else { // No typing
-      params.push(x.trim());
-      types.push(null);
-    }
-  });
-
-  let return_type = this.getFunctionReturnType(query);
-
-  let ans = {
-    parameters: params,
-    types: types,
-    defaults: defaults,
-    label: query.replace(/\n/g, '').replace(/\s+/g, ' '),
-    return_type: return_type,
-  };
-  return ans;
-}
-
-function generate_docblock() {
-  let editor;
-  let docblock;
-  // Load settings:
-  let [tab_length, tab_type] = ['editor.tabLength', 'editor.softTabs']
-    .map((q) => atom.config.get(q, {scope: ['source.python']}));
-  tab_type = tab_type ? ' '.repeat(tab_length) : '\t';
-  const get = (query) => atom.config.get(`docblock-python.${query}`);
-  const indent = get('indent');
-  const parameters = get('parameters');
-  const default_desc_text = get('default_desc_text');
-  const use_defaults = get('use_defaults');
-  const use_types = get('types.use_types');
-  const separate_types = get('types.separate_types');
-  const returns = get('returns');
-  const raises = get('raises');
-  const examples = get('examples');
-  const style = get('style');
-  const template = JSON.parse(JSON.stringify(templates[style]));
-
-  let triple_quote_str;
-  const quote_type = get('quote_type');
-  if (quote_type === 'double') {
-    triple_quote_str = '"""';
-  } else {
-    triple_quote_str = '\'\'\'';
-  };
-
-  const as_template = function(string) {
-    if (string.match(/\${/)) {
-      string = eval('`' + string.replace(/`/g, '\\`') + '`');
-    };
-    return string;
-  };
-
-  // Check for template strings
-  for (const k in template) {
-    if (template.hasOwnProperty(k)) {
-      template[k] = template[k].map(as_template);
-    }
-  };
-
-  let options = {
-    indent: indent,
-    tab_length: tab_length,
-    tab_type: tab_type,
-    triple_quote_str: triple_quote_str,
-    parameters: parameters,
-    default_desc_text: default_desc_text,
-    use_defaults: use_defaults,
-    use_types: use_types,
-    separate_types: separate_types,
-    returns: returns,
-    raises: raises,
-    style: style,
-    examples: examples,
-    template: template,
-    tabs: '',
-  };
-
-  this.options = options;
-
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let language = editor.getGrammar().name;
-    if (language === 'Python' ||
-        language === 'MagicPython' ||
-        language === 'Cython') {
-      let poss = editor.getCursorBufferPositions();
-      let poss_ = [];
-      let rows_ = [];
-      for (p in poss) {
-        if (!rows_.includes(poss[p].row)) {
-          rows_.push(poss[p].row);
-          poss_.push(poss[p]);
-        }
-      };
-      poss = poss_.sort((a, b) => b.row - a.row);
-
-      that = this;
-      failed = 0;
-      poss.map((pos) => {
-        editor.setCursorBufferPosition(pos);
-        editor.moveToFirstCharacterOfLine();
-        pos = editor.getCursorBufferPosition();
-        let col = pos.column;
-        let tabs = tab_type.repeat((col / tab_length) + indent);
-        options.tabs = tabs;
-        editor.selectToEndOfLine();
-        let query = editor.getSelectedText();
-        let logic = that.accepted_starts
-          .map((x) => query.search(x + ' '))
-          .some((x) => x >= 0);
-        if (logic) {
-          let header = that.get_header(pos, 0);
-          if (!header) {
-            atom.notifications.addWarning('Something went wrong.' +
-            'Reached end of file.');
-            return null;
-          };
-          query = header[0];
-          let n_lines = header[1];
-
-          if (query.match(/def|async def/)) {
-            options.returns = atom.config.get('docblock-python.returns');
-            options.default_desc_text = atom.config
-              .get('docblock-python.default_desc_text');
-            let docblock_and_attrs = that.process_def(query, options);
-            docblock = docblock_and_attrs[0];
-          } else if (query.search('class') == 0) {
-            docblock = that.process_class(query, options, pos);
-          } else {
-            failed += 1;
-            editor.setCursorBufferPosition(pos);
-            if (failed === poss.length) {
-              atom.notifications.addWarning('Nothing to do.' +
-              'Try selecting a line where you define a function or class.');
-            };
-          };
-
-          editor.setCursorBufferPosition(pos);
-          // Handle case when there is no empty line at the EOF
-          // and we try to add docblock for a one-line function
-          let addedNewLine = false;
-          if ((pos.row + n_lines + 1) >= editor.getLineCount()) {
-            editor.insertNewlineBelow();
-            addedNewLine = true;
-          };
-          editor.moveDown(n_lines + 1);
-          if (addedNewLine) {
-            editor.deleteToBeginningOfLine();
-          };
-          editor.moveToBeginningOfLine();
-          if (docblock) {
-            editor.insertText(docblock);
-          };
-          editor.setCursorBufferPosition(pos);
-        } else {
-          failed += 1;
-          editor.setCursorBufferPosition(pos);
-          if (failed === poss.length) {
-            atom.notifications.addWarning('Nothing to do.' +
-            'Try selecting a line where you define a function or class.');
-          };
-        };
-      });
-    };
-  }
-}
-
-function getFunctionReturnType(query) {
-  let i;
-  let return_type = null;
-  let match = query.match('^.+(?=\\()');
-  match = match[0];
-  let rev_match = match.split('').reverse().join('');
-  i = match.indexOf(' ');
-  let def_type = match.slice(0, i);
-  i = rev_match.indexOf(' ');
-  let name = rev_match.slice(0, i).split('').reverse().join('');
-  let cython_return_type = match.replace(def_type, '').replace(name, '').trim();
-
-  if (query.indexOf('->') > -1 && cython_return_type.length === 0) {
-    return_type = query.split('->')[1]
-      .replace(':', '')
-      .trim();
-  };
-
-  if (cython_return_type.length > 0) {
-    return_type = cython_return_type;
-  };
-
-  return return_type;
-}
-
-function scanArgs(args) {
-  let pieces = args.split(',');
-  let found = [];
-  let opened = 0;
-  let partial = '';
-  for (let i = 0; i <= pieces.length - 1; i++) {
-    opened += (pieces[i].match(/\(|\[|\{/g) || '').length;
-    opened -= (pieces[i].match(/\)|\]|\}/g) || '').length;
-    if (opened) {
-      if (partial) {
-        partial += ',' + pieces[i];
-      } else {
-        partial += pieces[i];
-      };
-    } else {
-      if (partial) {
-        partial += ',' + pieces[i];
-      } else {
-        partial += pieces[i];
-      };
-      found.push(partial);
-      partial = '';
-    };
-  };
-  return found.filter((x) => x.length > 0);
-}
-
-function formatReturn(return_type, returns, options) {
-  if (options.use_types) {
-    if (options.style == 'sphinx' || options.style == 'epytext') {
-      returns = returns
-        .map((v) => v.replace(' type', ' ' + return_type));
-    } else {
-      returns = returns
-        .map((v) => v.replace('type', return_type));
-    }
-  } else {
-    if (options.style == 'google') {
-      returns = returns
-        .map((v) => v.replace('type', return_type));
-    } else if (options.style == 'numpy') {
-      returns = returns.filter((x) => x.indexOf('type'));
-    } else if (options.style == 'sphinx') {
-      returns = returns.filter((x) => {
-        return x.indexOf(':rtype:') < 0;
-      });
-    } else if (options.style == 'epytext') {
-      returns = returns.filter((x) => {
-        return x.indexOf('@rtype:') < 0;
-      });
-    };
-  };
-  return returns;
-}
-
-// requires this
-function process_def(query, options) {
-  let that = this;
-  let tabs = options.tabs;
-  let template = JSON.parse(JSON.stringify(options.template));
-
-  let params = this.extract_parameters(query);
-  let lines = that.format_lines(params, options, 'parameter')
-    .join('\n') + '\n';
-  lines = template.parameters.join(tabs) + lines;
-
-  docblock = template.summary.join(tabs);
-  if (options.parameters && params.parameters.length > 0) {
-    if (lines) docblock += lines;
-  };
-  let return_type = params.return_type;
-  return_type = return_type === null ? 'type' : return_type;
-
-  let returns = this.formatReturn(return_type, template.returns, options);
-
-  if (options.returns) {
-    let return_txt = options.default_desc_text ? returns.join(tabs) :
-      returns.join(tabs).replace('Description of returned object', '');
-    docblock += return_txt;
-  };
-  if (options.raises) docblock += template.raises.join(tabs);
-  if (options.examples) docblock += template.examples.join(tabs);
-  docblock += template.end.join(tabs);
-  return [docblock, params.parameters];
-}
-
-function find_next(pattern, start, lines=0, accum='') {
-  let editor;
-  let done;
-  let indent = 0;
-  let query;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    indent = 0;
-    let current_line = editor.lineTextForBufferRow(start.row + lines);
-    query = accum + '\n' + current_line;
-    if (current_line !== undefined) {
-      done = false;
-    } else {
-      done = true;
-    };
-    let re = new RegExp(pattern);
-    if (!(re.test(query))) {
-      let logic = this.stop_words
-        .map((x) => query.search(x))
-        .some((x) => x >= 0);
-
-      if (logic) {
-        return null;
-      } else {
-        tmp = this.find_next(pattern, start, lines + 1, query);
-        lines = tmp;
-      };
-    } else {
-      ind_regex = new RegExp(that.options.tab_type, 'g');
-      def_line = query.match('.*(' + pattern +').*')[0];
-      indent = def_line.match(ind_regex);
-      if (!indent) {
-        indent = 0;
-      } else {
-        indent = indent.length;
-      };
-      done = true;
-    };
-  };
-
-  if (done) {
-    let pos = JSON.parse(JSON.stringify(start));
-    pos.row = pos.row + lines;
-    pos.column = pos.column + indent * that.options.tab_length;
-    return pos;
-  };
-
-  return lines;
-}
-
-function get_init(start, lines=0, accum='') {
-  let editor;
-  let n_tabs = start.column / this.options.tab_length;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let last_line = editor.lineTextForBufferRow(start.row + lines);
-    let query = accum + '\n' + last_line;
-    query = query.trim();
-    // editor.setCursorBufferPosition(start);
-    // editor.moveDown(lines);
-    // editor.moveToEndOfLine();
-    // editor.selectToBeginningOfLine();
-    // let last_line = editor.getSelectedText();
-    // editor.moveToEndOfLine();
-    // editor.selectToBufferPosition(start);
-    // let query = editor.getSelectedText();
-    // let re = new RegExp(this.options.tabs, 'g');
-    let re = new RegExp(this.options.tab_type, 'g');
-    if (!last_line.match(re) && last_line.length) {
-      return query;
-    }
-
-    let last_line_n_tabs;
-    if (last_line.length) {
-      last_line_n_tabs = last_line.match(re).length;
-    } else {
-      last_line_n_tabs = 9999; // This is to force the next if to be true
-    }
-
-    if (last_line_n_tabs > n_tabs &&
-        start.row + lines + 1 < editor.getLineCount()) {
-      let logic = this.stop_words
-        .map((x)=> query.search(x))
-        .some((x) => x >= 0);
-
-      if (logic) {
-        return query;
-      } else {
-        tmp = this.get_init(start, lines + 1, query);
-        lines = tmp;
-      };
-    } else {
-      return query;
-    };
-  };
-  return lines;
-}
-
-// requires this
-function process_list(args, options, that, label='parameter') {
-  let args_ = {
-    parameters: args,
-    types: args.map((x) => null),
-    defaults: args.map((x) => null),
-  };
-  let lines = that.format_lines(args_, options, label)
-    .join('\n') + '\n';
-  return lines;
-}
-
-function get_class_vars(start, init_pos) {
-  let new_start = JSON.parse(JSON.stringify(start));
-  let end = JSON.parse(JSON.stringify(init_pos));
-  new_start['row'] += 1;
-  end['row'] -= 1;
-  if (new_start['row'] === end['row']) {
-    return [];
-  };
-  let editor;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    editor.setCursorBufferPosition(new_start);
-    editor.selectToBufferPosition(init_pos);
-    let query = editor.getSelectedText();
-    let ans = query.split('\n')
-      .filter((x) => x.trim().length > 0 && x.indexOf('=') > -1)
-      .map((x) => x.split('=')[0].trim());
-    return ans;
-  };
-}
-
-function get_decorators(start, lines=-1, accum=[]) {
-  if (start.row == 0) return [];
-  if (start.row + lines < 0) return accum;
-  let editor;
-  let ans;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let line = editor.lineTextForBufferRow(start.row + lines);
-    let logic = this.stop_words
-      .map((x) => line.search(x))
-      .some((x) => x >= 0);
-    if (line.length > 0 && !logic ) {
-      accum.push(line);
-      ans = this.get_decorators(start, lines - 1, accum);
-    } else {
-      return accum;
-    };
-    return ans;
-  }
-}
-
-function process_dataclass(start, lines=1, accum=[[], []]) {
-  let editor;
-  let ans;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let line = editor.lineTextForBufferRow(start.row + lines);
-    let logic = ['def']
-      .map((x) => line.search(x))
-      .some((x) => x >= 0);
-    if (logic) {
-      return accum;
-    } else if (line.match(':')) {
-      let name = line.split(':')[0].trim();
-      let type = line.match('=') ? line.split(':')[1].split('=')[0].trim() :
-        line.split(':')[1].trim();
-      let default_value = line.match('=') ? line.split('=')[1].trim() : null;
-      accum[0].push([name, type, default_value]);
-    } else {
-      // Looking for attributes
-      if (line.match('=')) {
-        let attr = line.split('=')[0].trim();
-        accum[1].push(attr);
-      };
-    };
-    ans = process_dataclass(start, lines + 1, accum);
-    return ans;
-  }
-}
-
-// requires this
-function process_class(query, options, pos) {
-  let {tabs, template} = options;
-  let decorators = this.get_decorators(pos);
-  let is_dataclass = decorators
-    .map((x) => x.search('@dataclass'))
-    .some((x) => x >= 0);
-  if (is_dataclass) {
-    let [params, attributes] = process_dataclass(pos);
-    params = params[0].map((e, i) => {
-      return [e, params[1][i], params[2][i]];
-    });
-    params_dict = {
-      parameters: params[0],
-      types: params[1],
-      defaults: params[2],
-    };
-    let lines = format_lines(params_dict, options, 'parameter')
-      .join('\n') + '\n';
-    lines = template.parameters.join(tabs) + lines;
-    docblock = template.summary.join(tabs);
-    if (options.parameters && lines) {
-      docblock += lines;
-    };
-    if (attributes.length) {
-      let attrs_text = template.attributes.join(tabs);
-      let that = this;
-      attrs = process_list(attributes, options, that, 'attribute');
-      // let attrs = format_lines(args_, options, label)
-      //   .join('\n') + '\n';
-      if (attrs.length > 1) {
-        attrs_text += attrs;
-      };
-      docblock += attrs_text;
-    };
-    docblock += template.end.join(tabs);
-    return docblock;
-  };
-  let init_pos = this.find_next('def __init__', pos);
-  let attributes = [];
-  let args_list = [];
-  if (init_pos) {
-    let init_header = this.get_header(init_pos, 0);
-    let n_lines = init_header[1];
-    init_header = init_header[0];
-    let class_options = options;
-    class_options.returns = false;
-    class_options.raises = false;
-    let end_orig = class_options.template.end;
-    class_options.template.end = [];
-    let start_and_args = this.process_def(init_header, class_options);
-    let start = start_and_args[0];
-    args_list = start_and_args[1];
-    options.template.end = end_orig;
-
-    init_pos.row = init_pos.row + 1 + n_lines;
-
-    docblock = start;
-
-    let init_attributes = this.get_init(init_pos, 0);
-    init_attributes = init_attributes.match(/self.\w+/g);
-    attributes = init_attributes;
-
-    init_pos.row = init_pos.row - 1 - n_lines;
-  } else {
-    docblock = tabs + this.options.triple_quote_str + 'Short summary.\n';
-    init_pos = this.find_next('def|class|undefined', pos, 1);
-  };
-
-
-  let class_vars = get_class_vars(pos, init_pos);
-  attributes = attributes.concat(class_vars);
-
-  if (attributes.length) {
-    attributes = attributes.map((x) => x.replace('self.', ''));
-    attributes = Array(...new Set(attributes));
-    let long_attrs = attributes.filter((x) => !args_list.includes(x));
-    let short_attrs = attributes.filter((x) => args_list.includes(x));
-    let attrs_text = template.attributes.join(tabs);
-    if (long_attrs.length) {
-      let that = this;
-      attrs = this.process_list(long_attrs, options, that, 'attribute');
-      if (attrs.length > 1) {
-        attrs_text += attrs;
-      };
-    };
-
-    docblock += attrs_text;
-    if (short_attrs.length) {
-      docblock += tabs;
-      docblock += short_attrs
-        .map((x) => ['numpy', 'sphinx', 'epytext'].indexOf(options.style) > -1 ?
-          ((options.style == 'sphinx' || options.style == 'epytext')
-            ? `:attr ${x}:\n` : x + '\n'):
-          tabs + x + '\n')
-        .join(tabs);
-    };
-    docblock += template.end.join(tabs);
-  } else {
-    docblock = tabs + this.options.triple_quote_str + 'Short summary.' +
-      this.options.triple_quote_str + '\n';
-  };
-  return docblock;
-}
-
-// requires this
-function scan_up(start, lines) {
-  let editor;
-  let query;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    editor.setCursorBufferPosition(start);
-    editor.moveUp(lines);
-    editor.moveToBeginningOfLine();
-    editor.selectToBufferPosition(start);
-    let query = editor.getSelectedText();
-    if (!(/"""/.test(query))) {
-      let logic = this.stop_words
-        .map((x) => query.search(x))
-        .some((x) => x >= 0);
-      if (logic) {
-        return null;
-      } else {
-        tmp = this.scan_up(start, lines + 1);
-        query = tmp[0];
-        lines = tmp[1];
-      };
-    };
-  };
-  return [query, lines];
-}
-
-function scan_down(start, lines) {
-  let editor;
-  let query;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    editor.setCursorBufferPosition(start);
-    editor.moveDown(lines);
-    editor.moveToEndOfLine();
-    editor.selectToBufferPosition(start);
-    let query = editor.getSelectedText().trim();
-    if (!(/"""/.test(query))) {
-      let logic = this.stop_words
-        .map((x) => query.search(x))
-        .some((x) => x >= 0);
-
-      if (logic) return null;
-      tmp = this.scan_down(start, lines + 1);
-      query = tmp[0];
-      lines = tmp[1];
-    };
-  };
-  return [query, lines];
-}
-
-function get_docblock() {
-  let editor;
-
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let start_pos = editor.getCursorBufferPosition();
-    editor.moveToEndOfLine();
-    let pos_for_up = editor.getCursorBufferPosition();
-    let text_up = this.scan_up(pos_for_up, 0);
-    editor.setCursorBufferPosition(start_pos);
-    editor.moveToBeginningOfLine();
-    let pos_for_down = editor.getCursorBufferPosition();
-    let text_down = this.scan_down(pos_for_down, 0);
-    if ((text_up !== null) && (text_down !== null)) {
-      lines_up = text_up[0].split('\n');
-      lines_down = text_down[0].split('\n').slice(1);
-      return lines_up.join('\n') + lines_down.join('\n');
-    }
-  };
-}
-
-function get_def(start, direction) {
-  let query;
-  let def;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    if (start.row < 0) {
-      return {};
-    }
-    query = editor.lineTextForBufferRow(start.row);
-    let should_stop = ['return', 'yield']
-      .map((x) => query.search(x))
-      .some((x) => x >= 0);
-    if (should_stop) {
-      return {};
-    }
-    let logic = this.accepted_starts
-      .map((x) => query.search(x + ' '))
-      .some((x) => x >= 0);
-    if (logic) {
-      let header = this.get_header(start, 0);
-      def = {def: header, pos: start};
-    } else {
-      if (direction === 'up') {
-        def = this.get_def({row: start.row - 1, column: start.column}, 'up');
-      } else if (direction === 'down') {
-        def = this.get_def({row: start.row + 1, column: start.column}, 'down');
-      }
-    };
-    if (def === undefined) {
-      return {};
-    };
-    if (Object.keys(def).length) {
-      return {def: def.def, pos: def.pos};
-    } else {
-      return {};
-    };
-  };
-}
-
-function get_all_docblocks() {
-  let editor;
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let allText = editor.getText();
-    let dbRegex = new RegExp('"""([^])*?"""', 'g');
-    let match = dbRegex.exec(allText);
-    let allBlocks = [];
-    let last_end = -1;
-    while (match) {
-      let start = editor.buffer.positionForCharacterIndex(match.index);
-      if (atom.config.get('docblock-python.indent')) {
-        start.column = start.column - this.options.tab_length;
-      };
-      let def = this.get_def({row: start.row, column: start.column}, 'up');
-      if (Object.keys(def).length && last_end < def.pos.row) {
-        let block = {
-          docblock: match[0],
-          pos_start_char: match.index,
-          pos_start: start,
-          pos_end_char: dbRegex.lastIndex,
-          pos_end: editor.buffer.positionForCharacterIndex(dbRegex.lastIndex
-            + 1),
-          def: def.def[0],
-          def_lines: def.def[1],
-          def_pos: def.pos,
-        };
-        last_end = block.pos_end.row;
-        allBlocks.push(block);
-      };
-      match = dbRegex.exec(allText);
-    }
-    return allBlocks;
-  };
-}
-
-function add_section_notes() {
-  let editor;
-
-  // let idx = this.ordered_sections.indexOf('Notes');
-  // let sections_before = this.ordered_sections.slice(idx + 1);
-
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let language = editor.getGrammar().name;
-    if (language === 'Python' ||
-        language === 'MagicPython' ||
-        language === 'Cython') {
-      let current_docblock = this.get_docblock().split('\n');
-      for (let i = 1; i <= current_docblock.length; i++) {
-
-      };
-    };
-  };
-}
-
 export default {
+  activate(state) {
+    // Events subscribed to in atom's system can be easily cleaned up with a
+    // CompositeDisposable
+    this.subscriptions = new CompositeDisposable();
+
+    // Register command that toggles this view
+    this.subscriptions.add(atom.commands.add('atom-workspace', {
+      'docblock-python:generate_docblock': () => generate_docblock(),
+      'docblock-python:writeProjectConfig': () => writeProjectConfig(),
+    }));
+
+    loadProjectConfig();
+  },
+  deactivate() {
+    this.subscriptions.dispose();
+  },
+  serialize() {
+    return {};
+  },
   ...main,
-  format_lines,
-  formatReturn,
-  process_dataclass,
-  get_decorators,
-  find_next,
-  get_init,
-  get_def,
+  generate_docblock,
   get_all_docblocks,
-  lint_docblocks,
-  lint_def,
-  get_class_init,
-  get_missing_attr,
   provideLinter,
-  formatLint,
-  getStyledParam,
-  process_list,
-  extract_parameters,
-  process_def,
-  get_class_vars,
-  process_class,
-  get_header,
-  scan_up,
-  scan_down,
-  get_docblock,
-  add_section_notes,
-  generate_docblock,
-  getFunctionReturnType,
-  serialize, activate, deactivate,
 };
diff --git a/lib/linter-docblock-python.js b/lib/linter-docblock-python.js
index b04ed0c..1126561 100644
--- a/lib/linter-docblock-python.js
+++ b/lib/linter-docblock-python.js
@@ -1,9 +1,35 @@
 'use babel';
 /* eslint-disable require-jsdoc, no-invalid-this*/
 
-import {get_all_docblocks} from './docblock-python.js';
+import {
+  get_all_docblocks,
+  extract_parameters,
+  find_init,
+  get_atom_config,
+  copy,
+  get_init,
+  get_class_init,
+} from './utils.js';
 
-this.get_all_docblocks = get_all_docblocks;
+export function provideLinter() {
+  return {
+    name: 'docblock-python',
+    scope: 'file', // or 'project'
+    lintsOnChange: true,
+    grammarScopes: ['source.python'],
+    lint(textEditor) {
+      const editorPath = textEditor.getPath();
+      return new Promise(function(resolve) {
+        resolve((lint_docblocks() || [])
+          .map((missing) => {
+            return formatLint(missing.pos,
+              missing.par, missing.type, editorPath);
+          })
+        );
+      });
+    },
+  };
+}
 
 function formatLint(msg_pos, par_name, par_type, editorPath) {
   let type_text;
@@ -44,7 +70,7 @@ function getStyledParam(par) {
 }
 
 function lint_def(block) {
-  let params = that.extract_parameters(block.def);
+  let params = extract_parameters(block.def);
   let missing = [];
   let to_match;
   params.parameters.map((par) => {
@@ -58,7 +84,7 @@ function lint_def(block) {
       regex_pattern = regex_pattern.replace('*', '\\*');
       par_regex = new RegExp(regex_pattern);
       pos_in_def = block.def.match(par_regex).index;
-      par_pos = JSON.parse(JSON.stringify(block.def_pos));
+      par_pos = copy(block.def_pos);
       let par_row_offset = 0;
       let par_indent = block.def_pos.column;
       let par_col = block.def.match(par_regex).index + par_indent;
@@ -71,7 +97,7 @@ function lint_def(block) {
       };
       par_pos.row = par_pos.row + par_row_offset;
       par_pos.column = par_col;
-      par_pos_end = JSON.parse(JSON.stringify(par_pos));
+      par_pos_end = copy(par_pos);
       par_pos_end.column = par_pos_end.column + par.length;
       let data = {pos: [par_pos, par_pos_end], par: par, type: 'par'};
       missing.push(data);
@@ -80,33 +106,11 @@ function lint_def(block) {
   return missing;
 }
 
-function get_class_init(block) {
-  if (editor = atom.workspace.getActiveTextEditor()) {
-    let init_pos = that.find_init2(block.pos_end);
-    let attributes = that.get_init(init_pos);
-    attributes = attributes.match(/self.\w+/g);
-    if (!attributes) {
-      attributes = [];
-    };
-    attributes = attributes.map((x) => x.replace('self.', ''));
-    let init_def = that.get_def(init_pos, 0);
-    if (Object.keys(init_def).length === 0) {
-      return {};
-    };
-    let data = {
-      docblock: block.docblock,
-      def: init_def.def[0],
-      def_pos: init_def.pos,
-    };
-    return data;
-  };
-}
-
 function get_missing_attr(block) {
   if (editor = atom.workspace.getActiveTextEditor()) {
-    let init_pos = that.find_init2(block.pos_end);
+    let init_pos = find_init(block.pos_end);
     init_pos.row = init_pos.row + 1;
-    let attributes = that.get_init(init_pos);
+    let attributes = get_init(init_pos);
     attributes = attributes.match(/self.\w+/g);
     if (!attributes) {
       attributes = [];
@@ -123,7 +127,7 @@ function get_missing_attr(block) {
       } else {
         attr_regex = new RegExp(`self.${par}`);
 
-        let init_pos = that.find_init2(block.pos_end);
+        let init_pos = find_init(block.pos_end);
         init_pos.row = init_pos.row + 1;
         let finding_line = true;
         let i = 0;
@@ -153,27 +157,27 @@ function get_missing_attr(block) {
 }
 
 function lint_docblocks() {
+  let options = get_atom_config();
   let lint_enabled = atom.config.get('docblock-python.lint');
   if (!lint_enabled) {
     return [];
   };
   if (editor = atom.workspace.getActiveTextEditor()) {
-    let allBlocks = this.get_all_docblocks();
+    let allBlocks = get_all_docblocks();
     let missing_par = [];
     if (allBlocks.length > 0) {
-      let that = this;
       allBlocks.map((x) => {
         if (x.def.match('class')) {
-          let class_init = that.get_class_init(x);
+          let class_init = get_class_init(options, x);
           if (Object.keys(class_init).length === 0) {
             return;
           };
-          let data = that.lint_def(class_init);
+          let data = lint_def(class_init);
           missing_par.push(data);
-          data = that.get_missing_attr(x);
+          data = get_missing_attr(x);
           missing_par.push(data);
         } else {
-          let data = that.lint_def(x);
+          let data = lint_def(x);
           missing_par.push(data);
         }
       });
@@ -183,9 +187,7 @@ function lint_docblocks() {
 }
 
 export default {
-  formatLint,
   lint_def,
-  get_class_init,
   get_missing_attr,
   lint_docblocks,
   getStyledParam,
diff --git a/lib/styles.js b/lib/styles.js
new file mode 100644
index 0000000..ac85603
--- /dev/null
+++ b/lib/styles.js
@@ -0,0 +1,108 @@
+'use babel';
+/* Functions that format lines in a common python docstring style */
+
+/**
+ * The keyword arguments passed to all line-styling functions
+ * @typedef StyleOptions
+ * @property  {String}  [name='']  name of the parameter
+ * @property  {String}  [tabs=' '] the tab character
+ * @property  {Number}  [tab_length=4] number of tab characters to use
+ * @property  {Boolean} [use_defaults=true]
+ * @property  {String}  [default_value=''] what default value to describe
+ * @property  {Boolean} [default_desc_text=true] whether to use the default text
+ * @property  {Boolean} [use_types=true] whether to include detected type hints
+ * @property  {String}  [arg_type=''] the detected type hints
+ * @property  {String}  [type=''] pretty much the same as arg_type
+ */
+
+/**
+ * [numpy description]
+ * @param  {StyleOptions} styleOpts
+ * @return {String}  A parameter formated using numpy style
+ */
+export function numpy({name, tabs, default_desc_text, use_defaults,
+  default_value, use_types, separate_types, arg_type, type}) {
+  return [
+    `${tabs}${name} :`,
+    (use_types) ? ` ${arg_type}` : '',
+    '\n',
+    `${tabs}    `,
+    (default_desc_text) ? `Description of ${type} \`${name}\`` : '',
+    (use_defaults && default_value) ? ` (the default is ${default_value})`:'',
+    '.',
+  ].join('');
+}
+
+/**
+ * [numpy description]
+ * @param  {StyleOptions} styleOpts
+ * @return {String}  A parameter formated using google style
+ */
+export function google({name, tabs, default_desc_text, use_defaults,
+  default_value, use_types, separate_types, arg_type, type}) {
+  return [
+    `${tabs}    ${name}`,
+    (use_types) ? ` (${arg_type}): ` : ': ',
+    (default_desc_text) ? `Description of parameter \`${name}\`` : '',
+    (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
+    '.',
+  ].join('');
+}
+
+/**
+ * [numpy description]
+ * @param  {StyleOptions} styleOpts
+ * @return {String}  A parameter formated using sphinx style
+ */
+export function sphinx({name, tabs, default_desc_text, use_defaults,
+  default_value, use_types, separate_types, arg_type, type}) {
+  if (separate_types && use_types) {
+    return [
+      `${tabs}`,
+      (type == 'parameter') ? ':param' : ':attr',
+      ` ${name}: `,
+      (default_desc_text) ? `Description of parameter \`${name}\`` : '',
+      (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
+      '.\n',
+      `${tabs}:type ${name}: ${arg_type}`,
+    ].join('');
+  } else {
+    return [
+      `${tabs}`,
+      (type == 'parameter') ? ':param' : ':attr',
+      (use_types) ? ` ${arg_type} ` : ' ',
+      `${name}:`,
+      (default_desc_text) ? ` Description of parameter \`${name}\`` : ' ',
+      (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
+      '.',
+    ].join('');
+  };
+}
+
+/**
+ * [numpy description]
+ * @param  {StyleOptions} styleOpts
+ * @return {String}  A parameter formated using epytext style
+ */
+export function epytext({name, tabs, default_desc_text, use_defaults,
+  default_value, use_types, separate_types, arg_type, type}) {
+  return [
+    `${tabs}@param    ${name}: `,
+    (default_desc_text) ? `Description of parameter \`${name}\`` : '',
+    (use_defaults && default_value) ? `. Defaults to ${default_value}` : '',
+    '.\n',
+    `${tabs}@type:    ${arg_type}\n`,
+  ].join('');
+}
+
+const styles = new Proxy(
+  {numpy, google, epytext, sphinx},
+  {
+    get(target, style, receiver) {
+      if (style in target) return Reflect.get(target, style, receiver);
+      throw new ValueError(`no style ${style} found`);
+    },
+  }
+);
+
+export default styles;
diff --git a/lib/utils.js b/lib/utils.js
new file mode 100644
index 0000000..48ada42
--- /dev/null
+++ b/lib/utils.js
@@ -0,0 +1,845 @@
+'use babel';
+/* everything in here should be immutable objects or pure functions */
+/* eslint-disable require-jsdoc */
+/* eslint-enable no-undef */
+import main from './base.js';
+import templates from './templates.js';
+import styles from './styles.js';
+
+export const copy = (obj) => JSON.parse(JSON.stringify(obj));
+
+export const warn = (message) => atom.notifications.addWarning(message);
+warn.eof = () => warn('Something went wrong. Reached end of file.');
+warn.nothing_to_do = () => {
+  warn(
+    'Nothing to do. Try selecting a line where you define a function or class.'
+  );
+};
+
+const is_python = (lang) => ['Python', 'MagicPython', 'Cython'].includes(lang);
+
+export function get_atom_config() {
+  // Load settings:
+  let [tab_length, tab_type] = ['editor.tabLength', 'editor.softTabs']
+    .map((q) => atom.config.get(q, {scope: ['source.python']}));
+  tab_type = tab_type ? ' '.repeat(tab_length) : '\t';
+  const get = (query) => atom.config.get(`docblock-python.${query}`);
+  const indent = get('indent');
+  const parameters = get('parameters');
+  const default_desc_text = get('default_desc_text');
+  const use_defaults = get('use_defaults');
+  const use_types = get('types.use_types');
+  const separate_types = get('types.separate_types');
+  const returns = get('returns');
+  const raises = get('raises');
+  const examples = get('examples');
+  const style = get('style');
+  const template = copy(templates[style]);
+
+  let triple_quote_str;
+  const quote_type = get('quote_type');
+  if (quote_type === 'double') {
+    triple_quote_str = '"""';
+  } else {
+    triple_quote_str = '\'\'\'';
+  };
+
+  const as_template = function(string) {
+    if (string.match(/\${/)) {
+      string = eval('`' + string.replace(/`/g, '\\`') + '`');
+    };
+    return string;
+  };
+
+  // Check for template strings
+  for (const k in template) {
+    if (template.hasOwnProperty(k)) {
+      template[k] = template[k].map(as_template);
+    }
+  };
+
+  let options = {
+    indent: indent,
+    tab_length: tab_length,
+    tab_type: tab_type,
+    triple_quote_str: triple_quote_str,
+    parameters: parameters,
+    default_desc_text: default_desc_text,
+    use_defaults: use_defaults,
+    use_types: use_types,
+    separate_types: separate_types,
+    returns: returns,
+    raises: raises,
+    style: style,
+    examples: examples,
+    template: template,
+    tabs: '',
+  };
+  return options;
+}
+
+export function generate_docblock() {
+  let editor = atom.workspace.getActiveTextEditor();
+  let docblock;
+
+  let options = get_atom_config();
+
+  if (editor) {
+    if (is_python(editor.getGrammar().name)) {
+      let poss = editor.getCursorBufferPositions();
+      let poss_ = [];
+      let rows_ = [];
+      for (p in poss) {
+        if (!rows_.includes(poss[p].row)) {
+          rows_.push(poss[p].row);
+          poss_.push(poss[p]);
+        }
+      };
+      poss = poss_.sort((a, b) => b.row - a.row);
+
+      failed = 0;
+      poss.map((pos) => {
+        editor.setCursorBufferPosition(pos);
+        editor.moveToFirstCharacterOfLine();
+        pos = editor.getCursorBufferPosition();
+        let col = pos.column;
+        let tabs = options.tab_type.repeat(
+          (col / options.tab_length) + options.indent
+        );
+        options.tabs = tabs;
+        editor.selectToEndOfLine();
+        let query = editor.getSelectedText();
+        let logic = main.accepted_starts
+          .map((x) => query.search(x + ' '))
+          .some((x) => x >= 0);
+        if (logic) {
+          let header = get_header(options, pos, 0);
+          if (!header) {
+            warn.eof();
+            return null;
+          };
+          query = header[0];
+          let n_lines = header[1];
+
+          if (query.match(/def|async def/)) {
+            options.returns = atom.config.get('docblock-python.returns');
+            options.default_desc_text = atom.config
+              .get('docblock-python.default_desc_text');
+            let docblock_and_attrs = process_def(query, options);
+            docblock = docblock_and_attrs[0];
+          } else if (query.search('class') == 0) {
+            docblock = process_class(query, options, pos);
+          } else {
+            failed += 1;
+            editor.setCursorBufferPosition(pos);
+            if (failed === poss.length) {
+              warn.nothing_to_do();
+            };
+          };
+
+          editor.setCursorBufferPosition(pos);
+          // Handle case when there is no empty line at the EOF
+          // and we try to add docblock for a one-line function
+          let addedNewLine = false;
+          if ((pos.row + n_lines + 1) >= editor.getLineCount()) {
+            editor.insertNewlineBelow();
+            addedNewLine = true;
+          };
+          editor.moveDown(n_lines + 1);
+          if (addedNewLine) {
+            editor.deleteToBeginningOfLine();
+          };
+          editor.moveToBeginningOfLine();
+          if (docblock) {
+            editor.insertText(docblock);
+          };
+          editor.setCursorBufferPosition(pos);
+        } else {
+          failed += 1;
+          editor.setCursorBufferPosition(pos);
+          if (failed === poss.length) {
+            warn.nothing_to_do();
+          };
+        };
+      });
+    };
+  }
+}
+
+function get_header(options, start, lines, accum='') {
+  let editor = atom.workspace.getActiveTextEditor();
+  let query;
+  if (editor) {
+    query = accum + '\n' + editor.lineTextForBufferRow(start.row + lines);
+    query = query.trim();
+    if (!(/:$/.test(query))) {
+      // Handle one-line functions that return something
+      if (query.includes('return') || query.endsWith('...')) {
+        options.tabs = options.tabs.slice(options.tab_length);
+        return [query, lines];
+      };
+      if ((start.row + lines) <= (editor.getLineCount() - 2)) {
+        let tmp = get_header(options, start, lines + 1, query);
+        if (!tmp) return null;
+        query = tmp[0];
+        lines = tmp[1];
+      } else {
+        return null;
+      };
+    };
+  };
+  return [query, lines];
+};
+
+function process_def(query, options) {
+  let tabs = options.tabs;
+  let template = copy(options.template);
+
+  let params = extract_parameters(query);
+  let lines = format_lines(params, options, 'parameter')
+    .join('\n') + '\n';
+  lines = template.parameters.join(tabs) + lines;
+
+  docblock = template.summary.join(tabs);
+  if (options.parameters && params.parameters.length > 0) {
+    if (lines) docblock += lines;
+  };
+  let return_type = params.return_type;
+  return_type = return_type === null ? 'type' : return_type;
+
+  let returns = formatReturn(return_type, template.returns, options);
+
+  if (options.returns) {
+    let return_txt = options.default_desc_text ? returns.join(tabs) :
+      returns.join(tabs).replace('Description of returned object', '');
+    docblock += return_txt;
+  };
+  if (options.raises) docblock += template.raises.join(tabs);
+  if (options.examples) docblock += template.examples.join(tabs);
+  docblock += template.end.join(tabs);
+  return [docblock, params.parameters];
+}
+
+function process_class(query, options, pos) {
+  let {tabs, template} = options;
+  let decorators = get_decorators(pos);
+  let is_dataclass = decorators
+    .map((x) => x.search('@dataclass'))
+    .some((x) => x >= 0);
+  if (is_dataclass) {
+    let [params, attributes] = process_dataclass(pos);
+    params = params[0].map((e, i) => {
+      return [e, params[1][i], params[2][i]];
+    });
+    params_dict = {
+      parameters: params[0],
+      types: params[1],
+      defaults: params[2],
+    };
+    let lines = format_lines(params_dict, options, 'parameter')
+      .join('\n') + '\n';
+    lines = template.parameters.join(tabs) + lines;
+    docblock = template.summary.join(tabs);
+    if (options.parameters && lines) {
+      docblock += lines;
+    };
+    if (attributes.length) {
+      let attrs_text = template.attributes.join(tabs);
+      attrs = process_list(attributes, options, 'attribute');
+      // let attrs = format_lines(args_, options, label)
+      //   .join('\n') + '\n';
+      if (attrs.length > 1) {
+        attrs_text += attrs;
+      };
+      docblock += attrs_text;
+    };
+    docblock += template.end.join(tabs);
+    return docblock;
+  };
+  let init_pos = find_next(options, 'def __init__', pos);
+  let attributes = [];
+  let args_list = [];
+  if (init_pos) {
+    let init_header = get_header(options, init_pos, 0);
+    let n_lines = init_header[1];
+    init_header = init_header[0];
+    let class_options = options;
+    class_options.returns = false;
+    class_options.raises = false;
+    let end_orig = class_options.template.end;
+    class_options.template.end = [];
+    let start_and_args = process_def(init_header, class_options);
+    let start = start_and_args[0];
+    args_list = start_and_args[1];
+    options.template.end = end_orig;
+
+    init_pos.row = init_pos.row + 1 + n_lines;
+
+    docblock = start;
+
+    let init_attributes = get_init(options, init_pos, 0);
+    init_attributes = init_attributes.match(/self.\w+/g);
+    attributes = init_attributes;
+
+    init_pos.row = init_pos.row - 1 - n_lines;
+  } else {
+    docblock = tabs + options.triple_quote_str + 'Short summary.\n';
+    init_pos = find_next(options, 'def|class|undefined', pos, 1);
+  };
+  let class_vars = get_class_vars(pos, init_pos);
+  attributes = attributes.concat(class_vars);
+
+  if (attributes.length) {
+    attributes = attributes.map((x) => x.replace('self.', ''));
+    attributes = Array(...new Set(attributes));
+    let long_attrs = attributes.filter((x) => !args_list.includes(x));
+    let short_attrs = attributes.filter((x) => args_list.includes(x));
+    let attrs_text = template.attributes.join(tabs);
+    if (long_attrs.length) {
+      attrs = process_list(long_attrs, options, 'attribute');
+      if (attrs.length > 1) {
+        attrs_text += attrs;
+      };
+    };
+
+    docblock += attrs_text;
+    if (short_attrs.length) {
+      docblock += tabs;
+      docblock += short_attrs
+        .map((x) => ['numpy', 'sphinx', 'epytext'].indexOf(options.style) > -1 ?
+          ((options.style == 'sphinx' || options.style == 'epytext')
+            ? `:attr ${x}:\n` : x + '\n'):
+          tabs + x + '\n')
+        .join(tabs);
+    };
+    docblock += template.end.join(tabs);
+  } else {
+    docblock = tabs + options.triple_quote_str + 'Short summary.' +
+      options.triple_quote_str + '\n';
+  };
+  return docblock;
+}
+
+export function extract_parameters(query) {
+  let args = /\((.|\r|\n)*\)/.exec(query);
+  if (args === null) {
+    return {parameters: []};
+  };
+  args = args[0];
+  args = args.slice(1, args.length - 1);
+  let defaults = [];
+  let args_list = scanArgs(args)
+    .filter((x) => {
+      return x.trim() !== 'self' &&
+      x.trim() !== '*' &&
+      x.trim().length > 0;
+    })
+    .map((x) => {
+      let resp = x.split('=')[0].trim();
+      let default_ = x.split('=')[1];
+      default_ = default_ ? default_.trim() : null;
+      defaults.push(default_);
+      return resp;
+    });
+  let params = [];
+  let types = [];
+  args_list.map((x) => {
+    let parts;
+    if (x.indexOf(':') > 0) { // Normal typing
+      parts = x.split(':');
+      params.push(parts[0].trim());
+      types.push(parts[1].trim());
+    } else if (x.indexOf(' ') > 0) { // Cython typing
+      parts = x.split(' ');
+      params.push(parts[1].trim());
+      types.push(parts[0].trim());
+    } else { // No typing
+      params.push(x.trim());
+      types.push(null);
+    }
+  });
+
+  let return_type = getFunctionReturnType(query);
+
+  let ans = {
+    parameters: params,
+    types: types,
+    defaults: defaults,
+    label: query.replace(/\n/g, '').replace(/\s+/g, ' '),
+    return_type: return_type,
+  };
+  return ans;
+}
+
+function format_lines(params, options, type) {
+  let lines = null;
+  lines = params.parameters
+    .map((v, i) => {
+      if (v === 'self') return undefined;
+      let name = v;
+      let default_value = params.defaults[i];
+      let arg_type = params.types[i];
+      if (arg_type === null) {
+        arg_type = 'type';
+      };
+      let tabs = options.tabs;
+      let default_desc_text = options.default_desc_text;
+      let use_defaults = options.use_defaults;
+      let use_types = options.use_types;
+      let separate_types = options.separate_types;
+
+      return styles[options.style]({
+        name, tabs, default_desc_text, use_defaults,
+        default_value, use_types, separate_types, arg_type, type,
+      });
+    })
+    .filter(Boolean);
+  return lines;
+}
+
+function formatReturn(return_type, returns, options) {
+  if (options.use_types) {
+    if (options.style == 'sphinx' || options.style == 'epytext') {
+      returns = returns
+        .map((v) => v.replace(' type', ' ' + return_type));
+    } else {
+      returns = returns
+        .map((v) => v.replace('type', return_type));
+    }
+  } else {
+    if (options.style == 'google') {
+      returns = returns
+        .map((v) => v.replace('type', return_type));
+    } else if (options.style == 'numpy') {
+      returns = returns.filter((x) => x.indexOf('type'));
+    } else if (options.style == 'sphinx') {
+      returns = returns.filter((x) => {
+        return x.indexOf(':rtype:') < 0;
+      });
+    } else if (options.style == 'epytext') {
+      returns = returns.filter((x) => {
+        return x.indexOf('@rtype:') < 0;
+      });
+    };
+  };
+  return returns;
+}
+
+function get_decorators(start, lines=-1, accum=[]) {
+  if (start.row == 0) return [];
+  if (start.row + lines < 0) return accum;
+  let editor = atom.workspace.getActiveTextEditor();
+  let ans;
+  if (editor) {
+    let line = editor.lineTextForBufferRow(start.row + lines);
+    let logic = main.stop_words
+      .map((x) => line.search(x))
+      .some((x) => x >= 0);
+    if (line.length > 0 && !logic ) {
+      accum.push(line);
+      ans = get_decorators(start, lines - 1, accum);
+    } else {
+      return accum;
+    };
+    return ans;
+  }
+}
+
+function process_dataclass(start, lines=1, accum=[[], []]) {
+  let editor = atom.workspace.getActiveTextEditor();
+  let ans;
+  if (editor) {
+    let line = editor.lineTextForBufferRow(start.row + lines);
+    let logic = ['def']
+      .map((x) => line.search(x))
+      .some((x) => x >= 0);
+    if (logic) {
+      return accum;
+    } else if (line.match(':')) {
+      let name = line.split(':')[0].trim();
+      let type = line.match('=') ? line.split(':')[1].split('=')[0].trim() :
+        line.split(':')[1].trim();
+      let default_value = line.match('=') ? line.split('=')[1].trim() : null;
+      accum[0].push([name, type, default_value]);
+    } else {
+      // Looking for attributes
+      if (line.match('=')) {
+        let attr = line.split('=')[0].trim();
+        accum[1].push(attr);
+      };
+    };
+    ans = process_dataclass(start, lines + 1, accum);
+    return ans;
+  }
+}
+
+function process_list(args, options, label='parameter') {
+  let args_ = {
+    parameters: args,
+    types: args.map((x) => null),
+    defaults: args.map((x) => null),
+  };
+  let lines = format_lines(args_, options, label)
+    .join('\n') + '\n';
+  return lines;
+}
+
+function find_next(options, pattern, start, lines=0, accum='') {
+  let editor = atom.workspace.getActiveTextEditor();
+  let done;
+  let indent = 0;
+  let query;
+  if (editor) {
+    indent = 0;
+    let current_line = editor.lineTextForBufferRow(start.row + lines);
+    query = accum + '\n' + current_line;
+    if (current_line !== undefined) {
+      done = false;
+    } else {
+      done = true;
+    };
+    let re = new RegExp(pattern);
+    if (!(re.test(query))) {
+      let logic = main.stop_words
+        .map((x) => query.search(x))
+        .some((x) => x >= 0);
+
+      if (logic) {
+        return null;
+      } else {
+        tmp = find_next(options, pattern, start, lines + 1, query);
+        lines = tmp;
+      };
+    } else {
+      ind_regex = new RegExp(options.tab_type, 'g');
+      def_line = query.match('.*(' + pattern +').*')[0];
+      indent = def_line.match(ind_regex);
+      if (!indent) {
+        indent = 0;
+      } else {
+        indent = indent.length;
+      };
+      done = true;
+    };
+  };
+
+  if (done) {
+    let pos = copy(start);
+    pos.row = pos.row + lines;
+    pos.column = pos.column + indent * options.tab_length;
+    return pos;
+  };
+
+  return lines;
+}
+
+function get_init(options, start, lines=0, accum='') {
+  let editor;
+  let n_tabs = start.column / options.tab_length;
+  if (editor = atom.workspace.getActiveTextEditor()) {
+    let last_line = editor.lineTextForBufferRow(start.row + lines);
+    let query = accum + '\n' + last_line;
+    query = query.trim();
+    let re = new RegExp(options.tab_type, 'g');
+    if (!last_line.match(re) && last_line.length) {
+      return query;
+    }
+
+    let last_line_n_tabs;
+    if (last_line.length) {
+      last_line_n_tabs = last_line.match(re).length;
+    } else {
+      last_line_n_tabs = 9999; // This is to force the next if to be true
+    }
+
+    if (last_line_n_tabs > n_tabs &&
+        start.row + lines + 1 < editor.getLineCount()) {
+      let logic = main.stop_words
+        .map((x)=> query.search(x))
+        .some((x) => x >= 0);
+
+      if (logic) {
+        return query;
+      } else {
+        tmp = get_init(options, start, lines + 1, query);
+        lines = tmp;
+      };
+    } else {
+      return query;
+    };
+  };
+  return lines;
+}
+
+function get_class_vars(start, init_pos) {
+  let new_start = copy(start);
+  let end = copy(init_pos);
+  new_start['row'] += 1;
+  end['row'] -= 1;
+  if (new_start['row'] === end['row']) {
+    return [];
+  };
+  let editor = atom.workspace.getActiveTextEditor();
+  if (editor) {
+    editor.setCursorBufferPosition(new_start);
+    editor.selectToBufferPosition(init_pos);
+    let query = editor.getSelectedText();
+    let ans = query.split('\n')
+      .filter((x) => x.trim().length > 0 && x.indexOf('=') > -1)
+      .map((x) => x.split('=')[0].trim());
+    return ans;
+  };
+}
+
+function scanArgs(args) {
+  let pieces = args.split(',');
+  let found = [];
+  let opened = 0;
+  let partial = '';
+  for (let i = 0; i <= pieces.length - 1; i++) {
+    opened += (pieces[i].match(/\(|\[|\{/g) || '').length;
+    opened -= (pieces[i].match(/\)|\]|\}/g) || '').length;
+    if (opened) {
+      if (partial) {
+        partial += ',' + pieces[i];
+      } else {
+        partial += pieces[i];
+      };
+    } else {
+      if (partial) {
+        partial += ',' + pieces[i];
+      } else {
+        partial += pieces[i];
+      };
+      found.push(partial);
+      partial = '';
+    };
+  };
+  return found.filter((x) => x.length > 0);
+}
+
+function getFunctionReturnType(query) {
+  let i;
+  let return_type = null;
+  let match = query.match('^.+(?=\\()');
+  match = match[0];
+  let rev_match = match.split('').reverse().join('');
+  i = match.indexOf(' ');
+  let def_type = match.slice(0, i);
+  i = rev_match.indexOf(' ');
+  let name = rev_match.slice(0, i).split('').reverse().join('');
+  let cython_return_type = match.replace(def_type, '').replace(name, '').trim();
+
+  if (query.indexOf('->') > -1 && cython_return_type.length === 0) {
+    return_type = query.split('->')[1]
+      .replace(':', '')
+      .trim();
+  };
+
+  if (cython_return_type.length > 0) {
+    return_type = cython_return_type;
+  };
+
+  return return_type;
+}
+
+function get_def(start, direction) {
+  let query;
+  let def;
+  if (editor = atom.workspace.getActiveTextEditor()) {
+    if (start.row < 0) {
+      return {};
+    }
+    query = editor.lineTextForBufferRow(start.row);
+    let should_stop = ['return', 'yield']
+      .map((x) => query.search(x))
+      .some((x) => x >= 0);
+    if (should_stop) {
+      return {};
+    }
+    let logic = main.accepted_starts
+      .map((x) => query.search(x + ' '))
+      .some((x) => x >= 0);
+    if (logic) {
+      let header = get_header(start, 0);
+      def = {def: header, pos: start};
+    } else {
+      if (direction === 'up') {
+        def = get_def({row: start.row - 1, column: start.column}, 'up');
+      } else if (direction === 'down') {
+        def = get_def({row: start.row + 1, column: start.column}, 'down');
+      }
+    };
+    if (def === undefined) {
+      return {};
+    };
+    if (Object.keys(def).length) {
+      return {def: def.def, pos: def.pos};
+    } else {
+      return {};
+    };
+  };
+}
+
+export function get_all_docblocks() {
+  let options = get_atom_config();
+  let editor = atom.workspace.getActiveTextEditor();
+  if (editor) {
+    let allText = editor.getText();
+    let dbRegex = new RegExp('"""([^])*?"""', 'g');
+    let match = dbRegex.exec(allText);
+    let allBlocks = [];
+    let last_end = -1;
+    while (match) {
+      let start = editor.buffer.positionForCharacterIndex(match.index);
+      if (atom.config.get('docblock-python.indent')) {
+        start.column = start.column - options.tab_length;
+      };
+      let def = get_def({row: start.row, column: start.column}, 'up');
+      if (Object.keys(def).length && last_end < def.pos.row) {
+        let block = {
+          docblock: match[0],
+          pos_start_char: match.index,
+          pos_start: start,
+          pos_end_char: dbRegex.lastIndex,
+          pos_end: editor.buffer.positionForCharacterIndex(dbRegex.lastIndex
+            + 1),
+          def: def.def[0],
+          def_lines: def.def[1],
+          def_pos: def.pos,
+        };
+        last_end = block.pos_end.row;
+        allBlocks.push(block);
+      };
+      match = dbRegex.exec(allText);
+    }
+    return allBlocks;
+  };
+}
+
+export function get_class_init(options, block) {
+  if (editor = atom.workspace.getActiveTextEditor()) {
+    let init_pos = find_init(options, block.pos_end);
+    let attributes = get_init(init_pos);
+    attributes = attributes.match(/self.\w+/g);
+    if (!attributes) {
+      attributes = [];
+    };
+    attributes = attributes.map((x) => x.replace('self.', ''));
+    let init_def = get_def(init_pos, 0);
+    if (Object.keys(init_def).length === 0) {
+      return {};
+    };
+    let data = {
+      docblock: block.docblock,
+      def: init_def.def[0],
+      def_pos: init_def.pos,
+    };
+    return data;
+  };
+}
+
+function find_init(options, start, lines=0, accum='') {
+  let editor = atom.workspace.getActiveTextEditor();
+  let done;
+  let indent = 0;
+  if (editor) {
+    indent = 0;
+    let query = (accum + '\n' + editor.lineTextForBufferRow(start.row +
+      lines));
+    done = false;
+    if (!(/def __init__/.test(query))) {
+      let logic = main.stop_words
+        .map((x) => query.search(x))
+        .some((x) => x >= 0);
+
+      if (logic) {
+        return null;
+      } else {
+        tmp = find_init(options, start, lines + 1, query);
+        lines = tmp;
+      };
+    } else {
+      ind_regex = new RegExp(options.tab_type, 'g');
+      def_line = query.match('.*def __init__.*')[0];
+      indent = def_line.match(ind_regex).length;
+      done = true;
+    };
+  };
+
+  if (done) {
+    let pos = JSON.parse(JSON.stringify(start));
+    pos.row = pos.row + lines;
+    pos.column = pos.column + indent * options.tab_length;
+    return pos;
+  };
+
+  return lines;
+}
+
+// function get_docblock() {
+//   let editor = atom.workspace.getActiveTextEditor();
+//   if (editor) {
+//     let start_pos = editor.getCursorBufferPosition();
+//     editor.moveToEndOfLine();
+//     let pos_for_up = editor.getCursorBufferPosition();
+//     let text_up = scan_up(pos_for_up, 0);
+//     editor.setCursorBufferPosition(start_pos);
+//     editor.moveToBeginningOfLine();
+//     let pos_for_down = editor.getCursorBufferPosition();
+//     let text_down = scan_down(pos_for_down, 0);
+//     if ((text_up !== null) && (text_down !== null)) {
+//       lines_up = text_up[0].split('\n');
+//       lines_down = text_down[0].split('\n').slice(1);
+//       return lines_up.join('\n') + lines_down.join('\n');
+//     }
+//   };
+// }
+//
+// function scan_up(start, lines) {
+//   let editor = atom.workspace.getActiveTextEditor();
+//   let query;
+//   if (editor) {
+//     editor.setCursorBufferPosition(start);
+//     editor.moveUp(lines);
+//     editor.moveToBeginningOfLine();
+//     editor.selectToBufferPosition(start);
+//     let query = editor.getSelectedText();
+//     if (!(/"""/.test(query))) {
+//       let logic = main.stop_words
+//         .map((x) => query.search(x))
+//         .some((x) => x >= 0);
+//       if (logic) {
+//         return null;
+//       } else {
+//         tmp = scan_up(start, lines + 1);
+//         query = tmp[0];
+//         lines = tmp[1];
+//       };
+//     };
+//   };
+//   return [query, lines];
+// }
+//
+// function scan_down(start, lines) {
+//   let editor = atom.workspace.getActiveTextEditor();
+//   let query;
+//   if (editor) {
+//     editor.setCursorBufferPosition(start);
+//     editor.moveDown(lines);
+//     editor.moveToEndOfLine();
+//     editor.selectToBufferPosition(start);
+//     let query = editor.getSelectedText().trim();
+//     if (!(/"""/.test(query))) {
+//       let logic = main.stop_words
+//         .map((x) => query.search(x))
+//         .some((x) => x >= 0);
+//
+//       if (logic) return null;
+//       tmp = scan_down(start, lines + 1);
+//       query = tmp[0];
+//       lines = tmp[1];
+//     };
+//   };
+//   return [query, lines];
+// }