Addd conversion stuff
Fixed more stuff. Add working now.