SIgnificant changes to get basic look command working. Also minor
clean-up here and there.