More changes as I try to get framework working.