Revert "Added TODO to finish the project"

This reverts commit 3523a7397048ea3279a490355e338b74c4b2f322.
Revert "HD fix"

This reverts commit b2a2787cdaec271c071bef55dca5e7aa766908b5.