Update screens, get db working, refactor into services