First merge, havent attempted to change the code yet