Big changes thanks to icy doing most of the work now
Added memory store tests