Started implementing carrie's design