Note that the 'BONUS!' represents something that could be done, and does not count as a strict TODO.