Todos

Modularized by Thomas Davis. Originally by Jérôme Gravel-Niquet.