Major refactoring.
Added Presentation