Add to schematic, edit TODO