Many modifications, now loads (not looking at tests yet).