refactored a lot! and added some fuinctionality, like trips list and restoring the users and trips