Add note
Add methods and note
Move TODO note
Add test