New command classes/structure, bug fixes, storage