-Latest round of fixes with everything but imports working properly