move the TODO's to proper Github issues