initial commit
add additional addons and etc.
merged