Re merge timeline

putting in js for timeline