Some more additions. See TODO´s for missing tasks!