Fixed some derps and still trying to get it to build