Fixed indexing bug...  almost working....