Updated property types and began working on constructors