Cleanup, outline JS. Still Unstable.