Optimized, removed unneeded deps, finished demo