more refactor -- first mobile v. desktop considerations...