Start to add changes
Fix tests
Merge pull request #22 from FundedByMe/fixes

Store Legal User Type Directly in