further work on integrating lf, reintroducing payments