Added grouping and fromating, add first part of the find replace