committing week 3 (not finished)