Collapse Commands/Responses
Refactor storage commands slightly and add rest of commands