Adding basic setup stuff