Feature/first look

make sure you understand the changes.