refactoring to use UUIDs instead of strings and ints for ids