basic working application.
Manual merge