Unmortgage working, tests pass.
Re factoring