Rearranged some of the scripts, still doesn't compile to js..