TODO tags added; lots of additions
Additions