More functionality and notes for later.