Finished it

Will add more tests later, but all fields complete.