big jobs done, fiddling with .js