restructuring. implemented markup store