Crap ton of changes + source files