Working on and adding new stuff soon