Almost done, still working on conversion and validation