Added TODO
Init