Beginning work on bringing it up to-date with schema