welp, moved them all into views. Looking okay.