[Console] rebased on new implementation, step 1