genericised some handler shit. added command pkg