Made initial changes to reflect submission

This is a draft