Added short and long term TODOs