refactor, added keybindings, playing with initialize flow