Constructor now working