Just need to fix this indexing problem now...