Continue parser overhul - redo storage commands.