Added more crap to Generator just for fun