Seemingly working version

Commiting through web UI... TODO: fix package.json