Major update to user interface and command/query bits