TODOs added to Machine