Updated index, added ember, still need to integrate ember in