swiftified
data source now uses indexPaths instead of indexes