Updated more stuff. Just have to finish interactiveness with users