refactoring project to remove sorting and focus on long term storage