Condense functions
Added package.json and very simple tests