Working add, working indices
Working refactored content loop