feb 12, wrote DAO and 2 components