Added notes for later implementation