initial commit
merged with auto-generated stuff