Initial pass at the store
Merged changes