got the rest of the files converted to objects, not really happy with the structure, but it runs.