separated into apps and created databases
merged