Added type ids for BfNodes... This should make testing easier. Want to move to TDD