Initial import of experimental branch