Working on making it not freeze