Some more progress on Console