Restructure to make more nodey