added todo notes for clarity