Cap 1 almost finished