Most working except for queries and some validations/mariam will be
looking at queries