integrating things
i messed everything up