Added logging, storage (still broke)