All JS now done in same .js file