Added new class vars and js
Added js stuff