lots of recfactoring, tutorials2 still a mess