Added text support
Now uses i32 instead of int
Changed visibilities around to make things exportable