mashk shaping up, still there are not tests