Delete TODOs
Merge branch 'master' of https://github.com/Nekeras/Oxygen.git
All machines added