Revamped Console Quickstart

Brought in line with other changes