Integrated with UI

ToDo: Better formatting