Video 34 done did some more refactoring and fixed errors