finish mapping commands to funcs really