[#2] Finishing touches before 'Task 1' implementation.