Reorganization

Added Recurrence control, several bug fixes, updated combo, moved the
wuiddle out of wui-1-2 because its not ready yet.