Structure cleaned up; beginnings of index; JS WIP