added annotations and progress on dao