Switched the Set to a List. Added menu handling.