Merged version of all our code