Updated finally! Works this time!

Still buggy.