Added lists and auto-fill. Also modified remove.