added TODO note-s for later