Chapter 1 06062014

work in progress
updated structure
used template