Almost done

Has a few bugs, and needs more work., but is coming along nicely