more work integrating fe

tests pass