Add base of execution basic stuff works correctly