Add Data Model and Tested UI