Add first try at integer based indexing