Finished part two. Have sorting and filtering