Finished yet another point in the todo. Thanks to Sérgio for the help.