Added 3.4 c) (WIP) and tests.