Began to implement span either side of tags

Not functioning yet, but commiting before location changes