Adding comments for things I should investigate