Export actual object
Complete refactor (finally got it hooked up to a testing environment