Basic setup

Basic setup changes completed