updated the branch alongside the mockfont branch.