need to add getter/setter
merged stuff