Dev

still needs export to work, and some other stuff. not stable.