This needs to be changed to properties, too