Initial commit before moving to github.
Merge cw-flair/master