Weekly task
Making everything ready for assignment1