issue #6 WIP
Merge pull request #11 from jmanock/fab9

issue #6 WIP