fjdldfjlks
almost done main page
fized merge conflicts