Initial import of version 7