i have no idea
fixing merge issues
simplify and streamline