added remove and move functions, and a pinch of testing