Combined our forks, added some stuff