M17 - Add database singleton and add text treatment form.