Moved from TODO.md to Github Issues