Squashed commit of the following:

    add test code
    add origanizationuser data model
    ok map method