Finished first pass of console code