refactored a bit; tried to add presentation view to leap