added modals, changed game shape, changed colors
holy crap wow how did we fix these merge conflicts