Re-organized the code
Switch to UUIDs
Store Adapter