Update Console usage. Completes #1