Added some TODO notes (so I won't forget some Alex good points)