beginnings of landing page
resolve merge conflict