Getting closer

Fixed some indexing issues. Almost there