Friend Relations TODO

+ Added new TODOs, resulting from my Code-Review