Added initial setup
Fixes