Cmckee/merit

Think I finally fixed schema problems.