Getting stuff to run
Merging