Update-8/14

Completed TODO items