Refactor of sorting and parsing and added recurring tasks