some changes to get some kind of flow going... work in progress, tests not updated. errors in flow remain