Major updates and moar files