Initial branch commit.
Got working dialogs