Updated to near-final version

Added a bunch of stuff