Changed some stuff, still doesn't work, reverting to master