Initial moving-over of code
Fixing up linting and lodash