Implemented assign and remove, cleaned up commented out code