basic refactoring seems to work
removed the all the fin passing