Prepared app for working together
merged