Working version for presentation. Minus fixing D3 bug