Added Notes and TODO's