Unfinished optimizations so not waiting on downloading JSON every time