Aggregationsgit status and major refactor