More fleshing out, added js