Problem 3 solved.
Problem 4 solved.
File renamed.
Unit tests.