Feature/better console