Added units calc
Added convert function