Initial import from SF, version 0.8