Quick Commit

Just trying to get what I've done so far put out on the master. Still
quite a bit to get done on the inquiry section.