I got it working but we need to streamline this somehow