Adding basic logic and PresentationService