Finish up switching over to JS