added storage, implemented some command functionality