Completed Total functionality with UI