Add an option for a done flag; clean up logic of entry format