Service refactor

split them up into individual records, you can work on a group through
a map and flatten