Merge pull request #142 from RonPasquarelli/master

FB_34,35 implementation. Other cleanup and minor refatctoring