Added visible TODOs + updated code