Almost code freeze of task 1