Moved everything to jquery