Serious progress on refactoring, fixing TFSA