Working on setting up environment
Fix merge conflicts