refactored application to make it object-oriented
merged conflicts