interim commit
Merge
added minor comments
updated Data Annotations on Account