added more fields
started implementing actual entries