Moved TODOs to it's own file