first draft.. added linting