alkay dialog roughly complete

holy shittanic
fixes merge conflicts and commits

title