Merge brycied00d's pewoewofijoj manaually.
Add a TODO.