Restructure everything into a class #9