logic to display and enter entries
merge