Added notes & todos