Back to work on UI - starting with data layer