Big commit, complete qa and mostly everything else
