Slightly tidier, now using javascript to pull in data