More changes to get basic functionality working.