Alright, deleted some stuff, modified some stuff