Added some TODO notes about short-term goals