review partial functionality + add mar