Some initial changes and setup