Rename tidying for consistency
Adding basic feature to check for faction
Changing repository method to retrieve all.
Relocating logic to a place better suited.
Removing todo