put and get working. free bug on remove