removed all commented code chunks, added lodash