Placeholders
Added first draft
merged files