Completed Favoriting Checkpoing with some refactoring