Added wrapping indexing - still can't handle multiple digits