New arguments, started refilling command.hpp