- Started adding code to handle partially empty entries