Adding some new stuff. Almost went over on time but I'll be quicker tomorrow