Pretty much rewrote the buildscript