updated the latest pushed version so that it actually runs, expect conflicts when trying pulling to local code