Feature/new console

merged OK