WIP: adding recurrence support and multiple instances of the same app