Initial commit (tasks 1 and 2 added)