Finished Annotation DTO and Test

Finished and Cleaned up code