Convert fibs to classes
Add benchmark code