Finishing up KeyStorage

All tests run now but I have to refactor for doing the allocation.
Btw I used a mock for DiscSpace. I can push that if anyone want to use that.