Added TODOs for Angel_Maker