Merged. Task 1.4 (probably) needs debugging.