third commit; added js stuff