todo19: fib refactor