first update on storage.java, still missing alot though