Got everything working.
Added a TODO.