Added todos from first public run