Storage, library still broken, work in progress