Moved TODOs into github issues