Moved todo functions to a plugin