Started adding presentation layer